Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 6 May 2010 22:42:55 +0000 (22:42 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 6 May 2010 22:42:55 +0000 (22:42 +0000)

Trivial merge